x11: Move from g_memdup() to g_memdup2()

The g_memdup() function is replaced by a safer version in newer versions
of GLib.

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 0102f65c7a8ce602c15f6a5c06c4153b79c0f0e4..d59dc37612a4064463e8ecbb78f3c7f65758e6d2 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -26,6 +26,8 @@
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 
+#include "gdk-private.h"
+
 #include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -760,7 +762,7 @@ gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device,
   g_free (device->last_axes);
 
   if (axes && n_axes)
-    device->last_axes = g_memdup (axes, sizeof (double) * n_axes);
+    device->last_axes = g_memdup2 (axes, sizeof (double) * n_axes);
   else
     device->last_axes = NULL;
 }

diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index feecf917a24c39a37323ea999c3141bc070d3ea6..1ab71a7cce8d75d1b910524ff4031e3e5abc156d 100644 (file)
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -4232,7 +4232,7 @@ _gdk_x11_moveresize_handle_event (const XEvent *event)
             *mv_resize->moveresize_pending_event = *event;
           else
             mv_resize->moveresize_pending_event =
-              g_memdup (event, sizeof (XEvent));
+              g_memdup2 (event, sizeof (XEvent));
 
           break;
         }